From: Florian Müllner <fmuellner@gnome.org>
Date: Mon, 25 Feb 2019 22:31:45 +0000 (+0100)
Subject: aggregateLayout: Fix natural width computation
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~888^2^2~93
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=70f4906ca5291e78708a8d3702b8c0a1d1c9d55a;p=gnome-shell.git

aggregateLayout: Fix natural width computation

Ouch, this went unnoticed for a long time: As the minimum size of menu
items is generally small (because its label can be ellipsized), we are
requesting the unellipsized width of the last "size child" instead of
the widest one.

https://gitlab.gnome.org/GNOME/gnome-shell/issues/996
---

diff --git a/js/ui/panel.js b/js/ui/panel.js
index f32e7f218..2e2a6592d 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -729,7 +729,7 @@ class AggregateLayout extends Clutter.BoxLayout {
             let child = this._sizeChildren[i];
             let [childMin, childNat] = child.get_preferred_width(forHeight);
             minWidth = Math.max(minWidth, childMin);
-            natWidth = Math.max(minWidth, childNat);
+            natWidth = Math.max(natWidth, childNat);
         }
         return [minWidth, natWidth];
     }